Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added dnsoptions to the docker driver #2992

Merged
merged 6 commits into from
Aug 11, 2017
Merged

Conversation

decoomanj
Copy link
Contributor

The DnsOptions for Docker were missing.

@decoomanj
Copy link
Contributor Author

Weird, first build was successful. Then I fixed a typo in a comment, and the build failed 🤔

@decoomanj
Copy link
Contributor Author

Great, now it builds again.

@@ -879,6 +880,10 @@ func TestDockerDriver_DNS(t *testing.T) {
if !reflect.DeepEqual(task.Config["dns_search_domains"], container.HostConfig.DNSSearch) {
t.Errorf("DNS Servers don't match.\nExpected:\n%s\nGot:\n%s\n", task.Config["dns_search_domains"], container.HostConfig.DNSSearch)
}

if !reflect.DeepEqual(task.Config["dns_options"], container.HostConfig.DNSOptions) {
t.Errorf("DNS Servers don't match.\nExpected:\n%s\nGot:\n%s\n", task.Config["dns_options"], container.HostConfig.DNSOptions)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hardly worth mentioning but looks like there's a copy/paste bug in there. Probably want to change "Servers" to "Options".

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done! Also updated the text in the statement above for the search_domains which was wrong too.

Copy link
Contributor

@dadgar dadgar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets fix up the test comment and then we can merge. Thanks!

@decoomanj
Copy link
Contributor Author

Again CI doesn't build because of other reasons :-(

@decoomanj
Copy link
Contributor Author

PR doesn't build because of missing AWS stuff??

@dadgar dadgar merged commit 7b3c0fe into hashicorp:master Aug 11, 2017
@dadgar
Copy link
Contributor

dadgar commented Aug 11, 2017

Thanks @decoomanj! Yeah build is breaking because a PR from the other day. Will resolve soon!

@github-actions
Copy link

I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 26, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants